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

Change-Id: I5590bc31e7acb592155bf222d6d39ca43895d165