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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22246438', 'googleplex-android-review.googlesource.com/22935398', 'googleplex-android-review.googlesource.com/23035180'] into sparse-10032719-L12500000960505384.
SPARSE_CHANGE: If4299bc7bba022b12c33343ecc2a45050c159210
SPARSE_CHANGE: I76427c0064c9935c76e3ec8662d6b7955bcbfd2b
SPARSE_CHANGE: I28e35f8686a66b6eb76f3a09a163c6873ca23ba0

Change-Id: I928317b598ba1e0b68814ce8c199d0db12ab076e