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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35706055', 'googleplex-android-review.googlesource.com/35706536', 'googleplex-android-review.googlesource.com/35706537', 'googleplex-android-review.googlesource.com/35714138', 'googleplex-android-review.googlesource.com/35740913', 'googleplex-android-review.googlesource.com/35832020', 'googleplex-android-review.googlesource.com/35809623', 'googleplex-android-review.googlesource.com/35851753'] into 25Q4-release.

Change-Id: I8f0ebb218a91089bb3e2b078c939214e3bad2a32