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

Change-Id: I5b03d74cbff9e5798f94cc55c7450c8e8109d885