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

* commit '1e928f404f83da6ed29dc3d0b28f0a376b12d327':
  Ensure dumpstate children die