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

Change-Id: Id603fd2f5fd206d591ba315529582cb1fb6541dc