Merge cherrypicks of ['googleplex-android-review.googlesource.com/22381002', 'googleplex-android-review.googlesource.com/23351139', 'googleplex-android-review.googlesource.com/23351578', 'googleplex-android-review.googlesource.com/23661867'] into sparse-10335664-L85300000961746380.
SPARSE_CHANGE: I7b3dcd06e7483fde745a1d56dfee7c4efc262ed7
SPARSE_CHANGE: I9fc10876c03933ac8aac05205d56ad6537df72a8
SPARSE_CHANGE: I427f0bc23f00d245c5093c75f13c9e533209362e
SPARSE_CHANGE: Ifcdac241bfe33f44f5f03f1a6db682c57f0cd388

Change-Id: I03c2d42f79c545736783501e54185a06ab5ed809