Merge cherrypicks of ['googleplex-android-review.googlesource.com/23242222', 'googleplex-android-review.googlesource.com/23341876', 'googleplex-android-review.googlesource.com/23341877', 'googleplex-android-review.googlesource.com/23401198', 'googleplex-android-review.googlesource.com/23425557', 'googleplex-android-review.googlesource.com/23443369'] into sparse-10133821-L66000000961199207.
SPARSE_CHANGE: Iac3e857c1c1bd2ceda0f111798a18daf869d8e04
SPARSE_CHANGE: I49536497997e4c81caac6fc5eaec9de52b771863
SPARSE_CHANGE: I2f4da49583a7f66ed9bf58e1f934ba37e61b8586
SPARSE_CHANGE: Ia1523d9c7795dc93a56b4fd57735de9285d396bb
SPARSE_CHANGE: I8e425674276ea4c2a12f431a5e10d178e54d81e2
SPARSE_CHANGE: I7c3354b0832668c1d721d085f39434cd328e045a

Change-Id: I05920cc00451119b4b1b89e9a39561b908901d71