Merge cherrypicks of ['googleplex-android-review.googlesource.com/36308769', 'googleplex-android-review.googlesource.com/36787311'] into 25Q4-release.

Change-Id: I57f15ffdab30b5b01c669207af7c6aa3f64a687a