Merge "BUG-1568 Remove unused VirtualSocket"