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

Change-Id: I5c896b485c78673bfc5e706601417f2c576f3384