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

Change-Id: I590d69e9ca8077bf427f877e2bc934e70d39bf18