Merge cherrypicks of ['googleplex-android-review.googlesource.com/30772089', 'googleplex-android-review.googlesource.com/30827344', 'googleplex-android-review.googlesource.com/30664691'] into 25Q1-release.

Change-Id: I5e84ec08125e75fc3b507686fc989c0b83b3fe02