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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24248316', '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-10615697-L60900000962405601.
SPARSE_CHANGE: Iaffbb53b29578c0575a7737c8aacdc8ca547b426
SPARSE_CHANGE: Id2e796edee45dae281f867c2b1549a80984c8a8e
SPARSE_CHANGE: I35df87ef05cb75dcd551cc4899a0a9863fdcbcc7
SPARSE_CHANGE: I890d102d10a3efa230e26e4e9753f9c66b71afdb
SPARSE_CHANGE: I67149c6faa2766be6d2537f2315dd2734bdd0447

Change-Id: I5ce7e3997d4f26829a81d0cca80af4208b17abc0