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

Change-Id: I66387c68951c4bf25df96716bab4565ab79ee6f5