Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev am: 4e7bc119 am: 7a776f03 Change-Id: I6203f2cd4b83537f8c19ca308f6399182408b881