Merge "Camera: Try adding a passthrough legacy service" into oc-dr1-dev