Merge "Add hack to make sure Socket#impl field is not null"