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

Change-Id: Ib76eb402a8257edbbe12197ce31acfb9158d0260