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

Change-Id: I9e3afd5b042bf95b104faf82118aed051e11a9a8