Merge "MediaMetrics: fix error for compiler update."