Merge "Add device name for connect string" into oc-dev