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

Change-Id: I26aa46234f8f00dc448cf152941cc33ce2ea7394