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

* commit 'bc59ca4bdbd993c1eb5c2a74f9b35857619da285':
  Avoid tearing down process groups twice.