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

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