am b6545bf5: (-s ours) am 0070026c: am 4247ebfd: Merge "init: use std::vector<std::string> for argument passing"

* commit 'b6545bf559d491f17e30af4fc3071489a3ea9755':