Merge "Put media.metrics service into proper group" into oc-dev am: 0990056439 am: 337a3fbbfc
am: 1612c4934e

Change-Id: Ibedd66aedc213fb8287fdd2fbd928c15904c846d