Merge "init: clean up exec command" am: 564aeca94e am: b1a519a2bd
am: acc81455a1

Change-Id: Id9548bea7f8a77cbf8b20c8007a561fa06049d95