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

Change-Id: I3384b81f4a2c782b2912acfa08817aed4dd13e23