Merge "Fix failing socket tests."