Merge cherrypicks of ['googleplex-android-review.googlesource.com/21465508'] into sparse-9608475-L41300000958690509.
SPARSE_CHANGE: Iea66d7782b3365dea827b854783aeddaa5c6699c

Change-Id: I1db552e1b2fc400a0c6e25cb308d947688e1e4e9