Merge "Camera tests: Include additional camera metadata header" into oc-dev