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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20219552', 'googleplex-android-review.googlesource.com/20946190', 'googleplex-android-review.googlesource.com/22616881', 'googleplex-android-review.googlesource.com/21327525', 'googleplex-android-review.googlesource.com/22621774', 'googleplex-android-review.googlesource.com/22905438', 'googleplex-android-review.googlesource.com/17738545', 'googleplex-android-review.googlesource.com/21253698', 'googleplex-android-review.googlesource.com/22787457', 'googleplex-android-review.googlesource.com/22512482', 'googleplex-android-review.googlesource.com/22895638'] into sparse-10161073-L49900000960778179.
SPARSE_CHANGE: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343
SPARSE_CHANGE: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
SPARSE_CHANGE: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc
SPARSE_CHANGE: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b
SPARSE_CHANGE: Id302c41f63028bc6dd58ba686e23d73565de9675
SPARSE_CHANGE: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
SPARSE_CHANGE: I7a725647c001062d1a76a82b680a02e3e2edcb03
SPARSE_CHANGE: I30579090c803b231fd750abbc4ad645805f7ece2
SPARSE_CHANGE: I848545f7aee202495c515f47a32871a2cb6ae707
SPARSE_CHANGE: I169a1f72c84528ca606b6a4da165d4fbcd02b08d
SPARSE_CHANGE: I7d3d35df0ec38945019f71755bed8797b7af4517

Change-Id: I9582a0401532e221bf2c720be71a3796324b8bbf