am dbbfa702: Fix MediaRouter bugs

* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
  Fix MediaRouter bugs