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

Change-Id: I4eff67a9b659bb339ff9c3c901ae6b0ed2f12eb8