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

Change-Id: Ie4107c338ade6efe51cd696190e13892d81f19df