Merge "track pkgname/version in media.metrics" into oc-mr1-dev am: dbedf0ab12
am: baf9bda6a4

Change-Id: Ibd812b72b8f3383097ee5eb8bb556dbbab8865a9