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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33986553', 'googleplex-android-review.googlesource.com/34016150', 'googleplex-android-review.googlesource.com/34037692', 'googleplex-android-review.googlesource.com/33986211', 'googleplex-android-review.googlesource.com/33977271', 'googleplex-android-review.googlesource.com/34062590'] into 25Q3-release.

Change-Id: I006c20358c8b75178fe6417ed2cdf5d690fb9bfc