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

Change-Id: I64d95ad654d9022178660cf08f27c31853ec2453