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

Change-Id: I1cc43fb5ec75074966d2b7f740929eb25f8d4408