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

Change-Id: Ia172271663be5e8a9eda15cd6afa7af06f09e7ee