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

Change-Id: I51a951e3fa0595a07d664d964cdf63592f674b1e