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: b364e46f" into oc-mr1-dev-plus-aosp
am: 078b2534
Change-Id: I254ec238c7ce7bc12f0dc91546f84c202efe937a