Merge "Remove codec aggregation/summarization" into oc-mr1-dev