Merge "Add MediaMetrics support to MediaParser"