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

Change-Id: I334db150aad46ff94197e13fa1ef1ec70d5dd066