am 574d6902: am ba8abb51: Merge "Ensure dumpstate children die"

* commit '574d6902b7e30a1e9c2375481549c8e8a712d6e6':
  Ensure dumpstate children die