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

Change-Id: I1c6945f6bff4756a67557aecf8a1d1c7ad6f916d