am 1c1a36cf: Merge "Update media router API." into jb-mr2-dev

* commit '1c1a36cfa59a48f5f07d48dfa191d0394cf7ff9e':
  Update media router API.