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

Change-Id: Ia1c26f8af71eaf2142fe0c685d2428e0be246c23