Merge "Merge "Worked around a bug where the a group child could be leaked"...
Merge "Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev am: f89e462b am: bbd80c9f" into oc-mr1-dev-plus-aosp
am: 913a06bf
Change-Id: I315f9b172363495012b6f9e2522086ec56f4f123