Merge "Media metrics APIs: changes based on API review" into sc-dev