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