Merge cherrypicks of ['googleplex-android-review.googlesource.com/33930990', 'googleplex-android-review.googlesource.com/34775661'] into 25Q3-release.

Change-Id: Idfb1646fd4102a95653c0c8b2cbfca0f39a9eb68