Merge cherrypicks of ['googleplex-android-review.googlesource.com/30814116', 'googleplex-android-review.googlesource.com/30842615', 'googleplex-android-review.googlesource.com/31018053', 'googleplex-android-review.googlesource.com/30997947'] into 25Q1-release.

Change-Id: Id4798fa0ebaa409d93d63727579ba390c9dd13cd