Merge "init: clean up exec command"