Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev