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

Change-Id: Ic56a52806763f0e5247c007803d13b0543e67d54