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

Change-Id: I1a683267af38e0d7229f3d4681eada94d6988901