am 9c6ca8bc: am 0e5dcbda: am cdc171cd: Merge "Update the MediaRouter support demo for new UIs" into lmp-mr1-dev

* commit '9c6ca8bcf5a86865c3ae481b1231257dc85aae61':