Merge "MediaRouter: Fix comments." into mnc-ub-dev