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

Change-Id: Ic57892e0cc2ea3421c9985d2bc63f452e71c485e