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

Change-Id: I070a745173c8fda054999ee07a5c210b6c9162c2