Merge cherrypicks of ['googleplex-android-review.googlesource.com/30870295'] into 25Q1-release.

Change-Id: Ibbd0db1e221b0ce2fcdd0e4e6a541e2e99fceba2