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

Change-Id: Ic6d404122bbd0111b0a567ac414f906f1e8c44bd