Merge "Avoid tearing down process groups twice." into lmp-mr1-dev