Merge \\\\"init: expand arguments of services when they start\\\\" am: 86cd314af3 am: f6ee6e16d9 am: 39b1d2043e
am: 8fb83d55d0

Change-Id: I9cce70ada4734f42229ab28799a56746d0afa01d