Merge "media: update c2 manifest xml"