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

Change-Id: I9abcf149775d347aefe3d8aaa36cd0bf3f3895a1