am 9d3ca15f: Merge "Kill LOCAL_SOCKET_NAMESPACE."

* commit '9d3ca15f1c8789390b8baaa2df28fd11b14a0a9d':
  Kill LOCAL_SOCKET_NAMESPACE.