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

Change-Id: I1695e83f46b1884be4333e1504d15f3b25fad440