Merge cherrypicks of ['googleplex-android-review.googlesource.com/35838654', 'googleplex-android-review.googlesource.com/35838655', 'googleplex-android-review.googlesource.com/35838656'] into 25Q4-release.

Change-Id: I8ecf2ad63d2cf6db47a8c7dc583bb0fa454c6cb4