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

Change-Id: Ibbfd9d58c25b53879596b1eab878320b419a6470