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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22733606', 'googleplex-android-review.googlesource.com/22912038', 'googleplex-android-review.googlesource.com/22915981'] into sparse-10025418-L15100000960301099.
SPARSE_CHANGE: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46
SPARSE_CHANGE: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73
SPARSE_CHANGE: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801

Change-Id: If4b2156fe647ff95b3b6be9757aab5f91e4eed89