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

Change-Id: If1f8eada94dee2768a625288d18e6b03c4175c6a
OSZAR »