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

Change-Id: Iad9f83bb1f9a241510897d4e6393441c7ed6bedf