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

Change-Id: Ic1fb23e1f27256cdb3239900db8811f65fe61faa