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

Change-Id: Ifd712e887c5d2631de654681ebf3f8acb1dcfee2