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

Change-Id: Ib84b3d6b46e42ef6822b788ecc4ce53730084608