Merge cherrypicks of ['googleplex-android-review.googlesource.com/33001801', 'googleplex-android-review.googlesource.com/32955270', 'googleplex-android-review.googlesource.com/32955271', 'googleplex-android-review.googlesource.com/32955655'] into 25Q2-release.

Change-Id: I088ab7753b2380ccaf27e13bf9a51d9663118d8b