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

Change-Id: Iaf0e102750972c404851cddc5bd65039719ebecc