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

Change-Id: I824a9a331f3e5196cdeb38cd1be5e0c8f5a59992