Merge cherrypicks of ['googleplex-android-review.googlesource.com/23241367'] into sparse-10133821-L55900000960787963.
SPARSE_CHANGE: I035a22604d8d2c637e45e9a60a1000337059a76e

Change-Id: Id638f2368f55160550950f577cf7449b9fc771ab