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

Change-Id: Ia1ba82d642f05370165acb685e0d24088c5a2888