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

Change-Id: Ib4d499d8ed42c5b5abb59d450aa82e6bdde54f91