Merge cherrypicks of ['googleplex-android-review.googlesource.com/22381002',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22381002', 'googleplex-android-review.googlesource.com/23661867', 'googleplex-android-review.googlesource.com/24219663', 'googleplex-android-review.googlesource.com/24296993', 'googleplex-android-review.googlesource.com/24211905', 'googleplex-android-review.googlesource.com/23590276'] into sparse-10316531-L04200000962983271.
SPARSE_CHANGE: I7b3dcd06e7483fde745a1d56dfee7c4efc262ed7
SPARSE_CHANGE: Ifcdac241bfe33f44f5f03f1a6db682c57f0cd388
SPARSE_CHANGE: Idaa7280ed23076b3282c987a249259e0c38b6630
SPARSE_CHANGE: Ie914f97925d8defb8c57818e5e7ffe958936336c
SPARSE_CHANGE: Ic3d97e05d99148e71b9dd64f8f56c20fc68193c9
SPARSE_CHANGE: Iee55ce04e15eb86a12f6d80bb277e20e708876b7

Change-Id: I5fd9857bf65e10183449a2d406405610fb610114