Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev