am 3c419da6: am dbbfa702: Fix MediaRouter bugs

* commit '3c419da632c7f332a50e5001331544cb8c919dce':
  Fix MediaRouter bugs