Merge "init: use delegating constructor for Service" am: ce3b2de809 am: 9549d6889a
am: d78477cf59

Change-Id: I9f43b6f3a35ff831efb4c7feb7f6cc27866bce31