Merge "CDD: Additions for AAC DRC metadata support" into nyc-dev