Merge cherrypicks of ['googleplex-android-review.googlesource.com/24351218', 'googleplex-android-review.googlesource.com/24525894', 'googleplex-android-review.googlesource.com/24592571'] into sparse-10683547-L93400000962852954.
SPARSE_CHANGE: I0ef0a6a48beccecdc51c0b08fb2390a0483520b8
SPARSE_CHANGE: Ic2453f6c369a1e9b72da27737f80c875d6264bce
SPARSE_CHANGE: Ib7ae8d4e13ae10316ee8693a496e866dcd574562

Change-Id: Ib22b35884b8a9f85d9aa98dbee27cb09af8278c5