Merge "Avoid empty mime type in media metrics records" into oc-mr1-dev am: 621faa7cb9
am: 67fc8178ef

Change-Id: I877b6307a76b0b476b648b8a498ef8e904891479