Merge cherrypicks of ['googleplex-android-review.googlesource.com/36198838', 'googleplex-android-review.googlesource.com/36199095', 'googleplex-android-review.googlesource.com/36199096'] into 25Q4-release.

Change-Id: I26024bec0c1b366f766daf41fbce4a61df9be987