Merge pull request #19274 from MattGal/remove-ubuntu-1710