Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev