Merge cherrypicks of ['googleplex-android-review.googlesource.com/33833389'] into sparse-13775243-L92100030014435199.
SPARSE_CHANGE: I1ee7a09b7628a67dcb3502b29d99761bafd913b5

Change-Id: I014067ef7b430f5da7efe807125ea5d74a17856a