Merge "Fix error handling for unknown codecs" into oc-mr1-dev