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

Change-Id: I4ad587b41fb3b72c1c7b84d9b6401bbb1bde75a8