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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35590474', 'googleplex-android-review.googlesource.com/35710854', 'googleplex-android-review.googlesource.com/35771217', 'googleplex-android-review.googlesource.com/35741038', 'googleplex-android-review.googlesource.com/35965815', 'googleplex-android-review.googlesource.com/36573471'] into 25Q4-release.

Change-Id: Iee681ce21df5a620d3741ea2a2eadd5299d628a1