Merge cherrypicks of ['googleplex-android-review.googlesource.com/26227893', 'googleplex-android-review.googlesource.com/26227894', 'googleplex-android-review.googlesource.com/26256296'] into sparse-11296643-L88600030002056189.
SPARSE_CHANGE: I20c79baccad74e37a025ad8fbf3a478acceb63a8
SPARSE_CHANGE: Iaa6859d792626a0f5b3ce1b92521b380421c52ab
SPARSE_CHANGE: Ifed5f071725d0c1960ce186623ad4c966c5f8fdd

Change-Id: Ib760c1a36849bcbbff43decb8932f72fccab53b7