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