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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35682828', 'googleplex-android-review.googlesource.com/36064104', 'googleplex-android-review.googlesource.com/36085973', 'googleplex-android-review.googlesource.com/36083747', 'googleplex-android-review.googlesource.com/36110320'] into 25Q4-release.

Change-Id: I4ba5018eab3139e4a3a7abf54915de4d6cd0682b