Merge "Move child package feature behind sys prop" into oc-dev