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

Change-Id: Ib7818912dd753cf40c61146c26674102bdbed338