Merge "Remove controller connection API" into oc-dev am: daefe1dcc7
am: 41950bc2c6

Change-Id: I48855908fe4fc4c284bc84b0d99bae5a82099c5d