Merge cherrypicks of ['googleplex-android-review.googlesource.com/23661867'] into sparse-10339990-L58300000961395368.
SPARSE_CHANGE: Ifcdac241bfe33f44f5f03f1a6db682c57f0cd388

Change-Id: I8e5d219304f0ebcd575a15cd78fdb9800e0e107a