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

Change-Id: Ic760ed934a88c2ff1f80eea8d2ec76cacdc1932a