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

Change-Id: I5c82e39b6fb4cb6a1ef3bb5233f31cf0392f7cb8