Merge "mm-core: Add QC specific MetaData and MediaDefs"