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

Change-Id: Iff47fc9359289003c2b8b32abe03efbc502de76c