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

Change-Id: I34ae6565bb0c60e8f40a09cade9e88f48191ddf0