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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/34414176', 'googleplex-android-review.googlesource.com/34626173', 'googleplex-android-review.googlesource.com/34628104', 'googleplex-android-review.googlesource.com/34628605', 'googleplex-android-review.googlesource.com/34629278', 'googleplex-android-review.googlesource.com/34629281', 'googleplex-android-review.googlesource.com/34629736', 'googleplex-android-review.googlesource.com/34640249'] into 25Q3-release.

Change-Id: I3353d5b6771b7a52986d09d58facc7263b5ce402