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

Change-Id: I92792befd7909fc873114c69b10ae832ed0bb31e