Merge \\\"Refactor Service::Start method.\\\" am: 82d2bcc21e am: f2ffdac47a
am: 77dbaad7b9

Change-Id: Ief7f4cc5b95b018d8476dd9a35cc76dd384fcbc5