Merge changes Idf19827e,Ifcada098

* changes:
  MediaMetrics: Add unit tests
  MediaMetrics: Update to use STL containers