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

Change-Id: I37a9f2dc925df002a27b3c967a8e2cdfb598534f