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

Change-Id: I63dffdcb809b39fbd649710a948bab9e7e35a8a0