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

Change-Id: I40a2a35c6be211b8fa60e6dce38f3654a847674f