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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35764073', 'googleplex-android-review.googlesource.com/35736456', 'googleplex-android-review.googlesource.com/35827136', 'googleplex-android-review.googlesource.com/35831026', 'googleplex-android-review.googlesource.com/35832404', 'googleplex-android-review.googlesource.com/35921281', 'googleplex-android-review.googlesource.com/35805220'] into 25Q4-release.

Change-Id: I211db50568d681cf4121c43e90e0719729324caf