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

Change-Id: I4cbf70423928c5722ce5a2d8738bff3eb27d3c67