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

Change-Id: Ie5e08bc99acf830efd82cfa303b5558ed2dee80f