Merge cherrypicks of ['googleplex-android-review.googlesource.com/38449639'] into 25Q2-release. Change-Id: Iba7efbb2d6be2ee4f668c8a7be813b402f785dce