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