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

Change-Id: I9f4a1e3b6e5c2f323d079c7af9d3d7f751fd3589
1 file changed