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

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