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

Change-Id: I033c0802185e4a4c18dc5bc97904293bd713c111