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

Change-Id: I089cfc6069aca96bddf7f990b9ef58ec14ff79e6