Merge "Fix API for SocketUtils" am: 4a66729cfe
am: 55d7bc0106

Change-Id: I81f59494241c5806c7c58422b6ab7d0be2cdd3a4