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

Change-Id: Ia844cf2e2bf68fe98db30a28e53c94fdc465cf44