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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/36006740', 'googleplex-android-review.googlesource.com/36127083', 'googleplex-android-review.googlesource.com/36064244', 'googleplex-android-review.googlesource.com/36110320', 'googleplex-android-review.googlesource.com/36131795', 'googleplex-android-review.googlesource.com/36131796', 'googleplex-android-review.googlesource.com/36133810'] into 25Q4-release.

Change-Id: Ifc3b58a76dce890ffba5c8ed2257ebb39f346f85