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

Change-Id: Iba3115910274e03c660158a5e8461f77f2d84cdb