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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24281855', 'googleplex-android-review.googlesource.com/24026547', 'googleplex-android-review.googlesource.com/24284551', 'googleplex-android-review.googlesource.com/24034687'] into sparse-10685236-L61400000962657635.
SPARSE_CHANGE: Id2e796edee45dae281f867c2b1549a80984c8a8e
SPARSE_CHANGE: I35df87ef05cb75dcd551cc4899a0a9863fdcbcc7
SPARSE_CHANGE: I890d102d10a3efa230e26e4e9753f9c66b71afdb
SPARSE_CHANGE: I67149c6faa2766be6d2537f2315dd2734bdd0447

Change-Id: Ibf1837a7c895577a9f69777bc24725efa152b32a