Merge "Nuplayer logging empty records to media.metrics" into oc-dev am: 32efa2fd44
am: 990edc2f16

Change-Id: I382c44aefd27ea33d46d316b343c769380e66678