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

Change-Id: Iacf2fe9fd902550c91d181a94603d4dedfcab74f