am 9d8aa0e4: am c52c957c: Merge "Various changes to Media* APIs requested by...
am 9d8aa0e4: am c52c957c: Merge "Various changes to Media* APIs requested by the api council." into jb-dev
* commit '9d8aa0e4':
Various changes to Media* APIs requested by the api council.