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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35742438', 'googleplex-android-review.googlesource.com/35601134', 'googleplex-android-review.googlesource.com/35907105', 'googleplex-android-review.googlesource.com/35917609', 'googleplex-android-review.googlesource.com/35914240', 'googleplex-android-review.googlesource.com/35935398', 'googleplex-android-review.googlesource.com/35915120'] into 25Q4-release.

Change-Id: I17b19704c2b9c418a24d392848761003c3ed1c94