Merge "Add MediaMetrics support to MediaParser" into mainline-prod