Merge "init: Allows shutting down cleanly."
am: f9f4ee8b72

* commit 'f9f4ee8b720c0431669c63bd684626a0e4e9ff51':
  init: Allows shutting down cleanly.