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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24102276', 'googleplex-android-review.googlesource.com/23987753', 'googleplex-android-review.googlesource.com/24101116', 'googleplex-android-review.googlesource.com/24031910', 'googleplex-android-review.googlesource.com/24081945', 'googleplex-android-review.googlesource.com/24058478'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: Ie826bdb163288e5741a33e26209d3175de426bd1
SPARSE_CHANGE: I3ba4478e7f26a77ef7d3e3be380e75e7c197edc2
SPARSE_CHANGE: Ibd786995cc6b8252aa5ce07d2aea5977ae2551db
SPARSE_CHANGE: Id5aee1323b9b3b254e19e8a4e189c1fa4f9d96ea
SPARSE_CHANGE: If664fbc58554d7cfabae86c9ec282f3f7cf50526
SPARSE_CHANGE: I362f0f253b466cfcbcebbe79936ae9a5c5261d92

Change-Id: I29a897592b815a71bbe03a386cb6d55ec363573f