Merge cherrypicks of ['googleplex-android-review.googlesource.com/30882759'] into 25Q1-release.

Change-Id: Ie1b478c0939b63a8be9a3c17e53d9f968fd90fa3