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

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