Merge "The framework really doesn't need to know the specifics of the codec" into jb-mr2-dev