am ae809c52: am 105e5e79: am a951e748: Fix failing socket tests.

* commit 'ae809c5228f090e44986b7304e4c0ec709e4cd61':