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

Change-Id: I6bd50ba259eb473edda3846901987acb39bb8f94