Merge "Check for null socket name in socket_connect_local." am: 1781dcc1c8
am: 00a23953a1

Change-Id: I063cfadb8bc0a6abb054e5c928705414e66594df