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

Change-Id: I4470d519ee03c4dcb4793e669fa2c433bcf528f0