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

Change-Id: I4e91e57f9a9cfa2c8f0eafe3ead0bb994d5b9227