Merge "Move sensord" into oc-dev