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

Change-Id: I49cb79aa4398c1b3dee5a5dd0dcb594f12036792