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

Change-Id: Ibe0740900a847395278223123b0a9d94deefb7e1