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

Change-Id: Icea836ef9b0e2f8e32f24a0ff1d0e4dd9920b569