am d503cc21: am b749be0b: Merge "Clean up init signal handling a little."

* commit 'd503cc21ec663b39e8d84feb373d3a287bb02d63':
  Clean up init signal handling a little.