am 579ec308: Merge "MediaRouter work" into jb-dev

* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
  MediaRouter work