Merge "Update owners with current team members"