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

Change-Id: I201f31c2303dd6ce87d8b9733bafa6453ab1ae21