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

Change-Id: Ic4c92a5a0eb1f0332fd2a98be5d9ccb9e6b2f10f