am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev
automerge: 6fe0fd6

* commit '6fe0fd69a1da7c0f548bcda91827d2a9e493c555':
  Avoid tearing down process groups twice.