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

Change-Id: Ib730adef8c222bc80879376e4c7891edf56df2a5