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

Change-Id: Icc663755c4410c0ee72028dcbbccb84d8dea3b18