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

Change-Id: Iacd89419c53589c97fa93a845f36e92a8873249d