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

Change-Id: I1535347956c5a1dbd39bae2aa691adf53a11e71a