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

Change-Id: Ied413ff0292769ac0e65cb105686be72246b41f3