Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am: bba60fadc7

Change-Id: Idd61a0034321755fd7e53deb6e452e7a14d0ba44