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

Change-Id: Ic46c8ed4e41b80927f74b2fa96ed997f6b581134