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

Change-Id: I34ed0982237b0f8b5ebccb893c2b3db03826a25a