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

Change-Id: I4af4de943241452e32749a18c16f53c227d6c2c4