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

Change-Id: Ie03dacca23284a884cbabc18ed0c642a67d3e085