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