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

Change-Id: I477312f234e802374640e4769672fb5a4263d52e