Merge "MediaMetrics: Remove friend access, use STL map"