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

Change-Id: I5b97619c5043fa3eea2483eb25824c3941f4689e