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

Change-Id: Iabd39eaaccec2a6aaf138559cfefe3e350940f2f