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

Change-Id: Iefb5af234f51e42292427307a8de5aa5534705b9