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

Change-Id: I6157d508f216babb3b3f4ed858bb930f46f34675