Merge "Camera: fix camera_metadata address expectation" into oc-dev