Merge "MediaMetrics: Misc fixes" into rvc-dev am: cba42e3c35

Change-Id: Ib0633452e26905e8823fba842870453f0bc12fd3