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

Change-Id: I29bcd74ec4455f75637a4917165fb75897667787