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

Change-Id: Idff0b09562000931678da6d77e54bd8fe96695d4