Merge "Do not call startService" am: 99b17ad266  -s ours am: 5b0fb32f12 am: 73c33bdf63
am: 5945893525

Change-Id: I184380605a26437226e481517d6803cac7c59ffe