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

* commit '15cd63027bc8413659114714068a665869a4b3b2':
  Avoid tearing down process groups twice.