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

Change-Id: I667898a56b609288d7778cec0dc8351889e10560