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

Change-Id: Id959e426e072f38852ba075c5d8c9e91c040176b