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

Change-Id: I9229418c7ea1cb57f7ea6317c058cadebb3095e4