Merge "Put media.metrics service into proper group" into oc-dev