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

Change-Id: I1da88a5445a7c5dc16faf0cbce49f5bb770f141f