Merge "MediaRouter: fix manager test bug"