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

Change-Id: I040d4bb1ddd92468c5c811c3c4cf1357adb08498