Merge "Move MediaMetrics into its own library" into oc-dev