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

Change-Id: I5b2c03c405b8261a2613905d8597c58b73ca4bb9