Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"