Merge "MediaMetrics: Minor logging fixes"