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