Merge "Do not call startService"