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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22794847', 'googleplex-android-review.googlesource.com/22791220', 'googleplex-android-review.googlesource.com/22779400', 'googleplex-android-review.googlesource.com/22569796', 'googleplex-android-review.googlesource.com/22670803'] into sparse-10007593-L54900000960252057.
SPARSE_CHANGE: I985ae560d8eff6ea063206c1e39bd694ab576fde
SPARSE_CHANGE: I7bc69ddf1c1742bd800eea4068ce268dfd96d0e3
SPARSE_CHANGE: I687f35f4989f9e23276451c9b3a3ce8578e64280
SPARSE_CHANGE: Ib3240c0b5037a3a20692c83e2daa8cd858125ca7
SPARSE_CHANGE: Ibd6d9a8377e4b5327a473f8b9adf4e569e826172

Change-Id: Ib40c95322662917782cffab3885631cc61c2d111