Merge cherrypicks of ['googleplex-android-review.googlesource.com/28406661'] into 24Q2-release. Change-Id: I906b525dbbfa5e8776eccabb2cb7565f84959c53