Merge cherrypicks of ['googleplex-android-review.googlesource.com/30800825'] into 25Q1-release. Change-Id: I50981abfe45f894fc3828afecf11431c3b5a54e0