am 9892aa5d: Merge "Fix SocketListener socket leak issue."

* commit '9892aa5d041132f1048f6707e09a434c25f06862':
  Fix SocketListener socket leak issue.