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

Change-Id: Id6424ec342a66d3f2b75a45a9988e399d35a0859