Merge "Fix cut/paste error in MEDIA_CODEC_REPORTED" into tm-dev