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

Change-Id: I404e905a8d8a67499f5b12fe04e86ddbf1c51be3