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

Change-Id: I73c4f380e3a6b9366d1c3bbe8e51b7677bb1f8b5