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