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

* commit 'eda0c80349d3671359b17f9579464e2fe164f3d9':