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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26866487', 'googleplex-android-review.googlesource.com/26866488', 'googleplex-android-review.googlesource.com/26866489', 'googleplex-android-review.googlesource.com/26866490'] into sparse-11973172-L60000030004607106.
SPARSE_CHANGE: Icacf051789ea40d23cd29c16168fbeb204cf8f5b
SPARSE_CHANGE: Icd35365f446296fb53b1068d278d4cf5fd25939e
SPARSE_CHANGE: Iea848c9d92abdf152d3eb827fbe1fb141f4687d7
SPARSE_CHANGE: I20c150845caad1c14cad35f661c31e36def968ac

Change-Id: I9f9ab3d592ca4b8459ff870b585a22cf766a9d35