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

Change-Id: I14f4510b05990778946c26048640048bbd333fcf