Merge "Camera: Re-enumarate new providers" into oc-dev