Merge "Fix NPE in MediaRouterService" into oc-mr1-dev am: 486b37cdac
am: 53987bf5bc

Change-Id: If7816b6ea62f159a3e0057d1ca98caf8cab23360