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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22688474', 'googleplex-android-review.googlesource.com/22721990', 'googleplex-android-review.googlesource.com/22733606'] into sparse-9991837-L83700000960209120.
SPARSE_CHANGE: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
SPARSE_CHANGE: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73
SPARSE_CHANGE: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46

Change-Id: Ife0b57ca76f80fec4935b23edbd990355ef111a6