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

Change-Id: Ib295be29cef95a69d750b18cf2bd08b89061e168