am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev

* commit 'eb2c1b21c6835399fa55227e498fb2930e533439':
  Restrict MediaRouter selection