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

Change-Id: Iab4a0afc1220512509f811dd9594bf9ffe5bae30