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

Change-Id: Ibda688aab845164e368a7cd5663a1963b72ace2f