am 46f3ce87: Merge "remove init_shell"

* commit '46f3ce87d9a130924c763a245639331c6e1a5b28':
  remove init_shell