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

Change-Id: I72ebf36cca7cc319cc5c95e9bab1a1c3cbd12875