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

Change-Id: I0dcaf830f0d65171b4a114e299793d68a4da6e40