Merge "Various changes to Media* APIs requested by the api council." into jb-dev