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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35633948', 'googleplex-android-review.googlesource.com/36004553', 'googleplex-android-review.googlesource.com/36004832', 'googleplex-android-review.googlesource.com/36004834', 'googleplex-android-review.googlesource.com/36004835', 'googleplex-android-review.googlesource.com/36004837', 'googleplex-android-review.googlesource.com/36005836', 'googleplex-android-review.googlesource.com/36005838', 'googleplex-android-review.googlesource.com/36005839', 'googleplex-android-review.googlesource.com/36007002', 'googleplex-android-review.googlesource.com/36007820'] into 25Q4-release.

Change-Id: Ia8aa8f8ec37dceab1fde122ee38f4cab3d5987b8