Merge cherrypicks of ['googleplex-android-review.googlesource.com/21408331'] into sparse-9662652-L75600000958834478.
SPARSE_CHANGE: Iddb8619be7bdd9767211e44913e8ba3871bc6580

Change-Id: I1076102b32fc729cf8d11c737e2e34bb207fb13f