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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33983703', 'googleplex-android-review.googlesource.com/34014275', 'googleplex-android-review.googlesource.com/34092391', 'googleplex-android-review.googlesource.com/34110410', 'googleplex-android-review.googlesource.com/34110411', 'googleplex-android-review.googlesource.com/34109358', 'googleplex-android-review.googlesource.com/34244395', 'googleplex-android-review.googlesource.com/34413636', 'googleplex-android-review.googlesource.com/34433416', 'googleplex-android-review.googlesource.com/34520516', 'googleplex-android-review.googlesource.com/34394957'] into sparse-13823283-L14800030014345027.
SPARSE_CHANGE: I8fd6dd30f9071cf7f8d61af71ffeca5fd77709af
SPARSE_CHANGE: I19963cfa7a18a39cf44ae021c10b12fd437cc324
SPARSE_CHANGE: I0fdd375b2fcc791d5c0e89f0534c993a665fdb65
SPARSE_CHANGE: Id0132c602ef55899e425f8ddb24af11dbb7729d0
SPARSE_CHANGE: I0ed6cefd370f6c8ae3820c8a8da97d92e4375327
SPARSE_CHANGE: I17e6a805bb74bd4ad9ee9259ff6793ba5246570d
SPARSE_CHANGE: I6f341ef675771bfdfcc71fc2599c949a280859dd
SPARSE_CHANGE: Ife591964a0b83377889d263eed0d23423fa4493b
SPARSE_CHANGE: I189ab42631fad2b91c21aa6928302b4b31be41e5
SPARSE_CHANGE: I2cac6f7aff18b9dbfda9e05686fa9fe524cbf424
SPARSE_CHANGE: I5e403186621e7191f9ec3967e66073da2b243865

Change-Id: I40ef428f26066f2cfdcdd6255703902788afa79a