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

Change-Id: I13158564e4fcefadd00e6eae45a24df901eaaa25