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

Change-Id: Iead3762d5064362fbc37be960d744d68b9f7b31d