Merge "init: Refactor service.h/cpp"
am: 3cb66ad34f

Change-Id: I453f102dd826e7e7e1924378d69931dbef36f27b