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

Change-Id: I1b33791d16ab52521cea50e9946dc53d1550a8cd
1 file changed