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

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