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

Change-Id: I24d015d3c090bc7a011f2be79a45270a9bb95640