Merge "Fix error handling for unknown codecs" into oc-mr1-dev am: 1e0c671e14
am: 21b70101db

Change-Id: I2fa940b40b4b2eb1c7f8b72aa96a2d3c25911520