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

Change-Id: Ibdc9b67b794d289cb94bea6b8a97a2f2c46ee9d7
1 file changed