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

Change-Id: If14877818a4cbf4088cb09eb8848f243bb0088b1