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

Change-Id: I79e949cad4d4e9e3fb06f81f8a12a21b5ecd7f5c