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

Change-Id: I26d02a724a6cd2b5f403acf056c0de76ddc88092