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

Change-Id: I488ba28a36e13d1b9b4792e7d1594489d50d19cc