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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/36300988', 'googleplex-android-review.googlesource.com/36594744', 'googleplex-android-review.googlesource.com/36594745', 'googleplex-android-review.googlesource.com/36598300', 'googleplex-android-review.googlesource.com/36598303', 'googleplex-android-review.googlesource.com/36598310', 'googleplex-android-review.googlesource.com/36598747', 'googleplex-android-review.googlesource.com/36598748', 'googleplex-android-review.googlesource.com/36598749', 'googleplex-android-review.googlesource.com/36598751', 'googleplex-android-review.googlesource.com/36598752', 'googleplex-android-review.googlesource.com/36598753'] into 25Q4-release.

Change-Id: Ifb8772d70ff85e597992c1dca33753f18c7bdf9e