Merge "MediaMetrics: Misc fixes" into rvc-dev am: cba42e3c35 am: 433d1f98e4 am: fe97e245a4 am: 000d766b77

Change-Id: Ie7a4319a60768b78a5397b8d64ddf6257fa0ddbd