Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579 am: 25105f6561 am: dfc1264eff" into oc-dev-plus-aosp