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

* commit '06024047258b01ad70f7d88e5773d8dc9b8d59fd':
  Avoid tearing down process groups twice.