Cablelabs/retrofit pull request

Pull request to include all work for MediaResource design refactoring.