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

Change-Id: I7366da510b5f611cfbb5fe2218d34c232c889c9c