Merge "Allow group includes to be by UUID instead of group ID"