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

Change-Id: Ic34c67fd26e3cd3c14b3aac9cdf45d28f5888a44