Merge "Camera: add camera owners" into oc-mr1-dev