Merge "Add Separator comments in MediaRouter2ServiceImpl"