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

Change-Id: I3ce47788d5eb363e62fa3adf788c71437f181571