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

Change-Id: I8c6299bf93715b635cbb50aac3a0151f8fed7854