am 31462128: Merge "Avoid tearing down process groups twice."

* commit '314621287801ba4c71467aad4702114eeb4d9951':
  Avoid tearing down process groups twice.