Merge "CDD: Updates to media codec section." into nyc-dev