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

Change-Id: I5471c2a4268be50129126a0eda8b016f1f9d1e7d