Merge "Give media.metrics service access to uid/pkg info" into oc-mr1-dev