Merge "Fix API for SocketUtils"
am: 4a66729cfe

Change-Id: I2340b528ab7a1a628e257205603d0d902f7cccd0