Merge "Update media router API." into jb-mr2-dev