Merge cherrypicks of ['googleplex-android-review.googlesource.com/33918591',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33918591', 'googleplex-android-review.googlesource.com/33922597', 'googleplex-android-review.googlesource.com/33967216', 'googleplex-android-review.googlesource.com/34013860', 'googleplex-android-review.googlesource.com/34038935'] into 25Q3-release.

Change-Id: Iec17400dcca2ba05a71eb1c653f454d9f12208d2