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