Merge "Suppress empty media.metrics records from nuplayer" into oc-dev