am c4cbb35f: am 88d254cf: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev

* commit 'c4cbb35fc22e0aee6a1386d024567274151f0c01':
  Handle group tear down only at group removed event