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

Change-Id: I3546502201086644c02080b029dfcf223761753a