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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35743035', 'googleplex-android-review.googlesource.com/35743299', 'googleplex-android-review.googlesource.com/35782396', 'googleplex-android-review.googlesource.com/35802532', 'googleplex-android-review.googlesource.com/35807552', 'googleplex-android-review.googlesource.com/35666383'] into 25Q4-release.

Change-Id: Ib872a5be8163ba0a5dced19ab418cce742466cf7