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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33849811', 'googleplex-android-review.googlesource.com/34329736', 'googleplex-android-review.googlesource.com/35238460', 'googleplex-android-review.googlesource.com/35130627', 'googleplex-android-review.googlesource.com/34714592', 'googleplex-android-review.googlesource.com/36030621'] into 25Q2-release.

Change-Id: I3ac44e319ff0b9c0e854340ea865feeec646cb2a