am 597d3e59: Merge "Actually close sockets when stopping the receive thread." into mnc-dev

* commit '597d3e59fe737aa3c7887532b62d41b063d5eab2':
  Actually close sockets when stopping the receive thread.