Merge "MediaMetrics: Cleanup the formatting of session ID" into sc-dev