Merge "change media analytics references to media metrics"