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

Change-Id: I0ebd0fe5825029ebd8d9fbb187faafdb8ac109f2