Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev am: f89e462bc7
am: bbd80c9f73

Change-Id: I675eae035a7b6fae7b5c557b3164a1b2670c6b35