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

Change-Id: Ied8c03cba54639871ac175fe71df11b2b0f348c6