Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev