Merge "Remove controller connection API" into oc-dev