Merge cherrypicks of ['googleplex-android-review.googlesource.com/36554574', 'googleplex-android-review.googlesource.com/36474575', 'googleplex-android-review.googlesource.com/36474580', 'googleplex-android-review.googlesource.com/36479960', 'googleplex-android-review.googlesource.com/36486639', 'googleplex-android-review.googlesource.com/36486642', 'googleplex-android-review.googlesource.com/36489516', 'googleplex-android-review.googlesource.com/36489517', 'googleplex-android-review.googlesource.com/36491475', 'googleplex-android-review.googlesource.com/36491479', 'googleplex-android-review.googlesource.com/36491480', 'googleplex-android-review.googlesource.com/36491490'] into 25Q4-release.
Change-Id: Iea35e8a516511bd2812ba8ef88ba4711bd4b67e1
