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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35949172', 'googleplex-android-review.googlesource.com/35838928', 'googleplex-android-review.googlesource.com/35998372', 'googleplex-android-review.googlesource.com/36064085', 'googleplex-android-review.googlesource.com/36073605', 'googleplex-android-review.googlesource.com/36099793'] into 25Q4-release.

Change-Id: I52d9e667351fa4bc4c2350b169175670341d2aab