Merge cherrypicks of ['googleplex-android-review.googlesource.com/32835589'] into 25Q2-release. Change-Id: I16c54efb744223e5e967e02bcac6db92db37a0d6