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

Change-Id: I688b24f13264739b1adca1daada8ce9f8c6e773d