am 934ecd56: Merge "Make socket binding behavior clearer"

* commit '934ecd5677fec1bae56662c10920a331e17eea81':
  Make socket binding behavior clearer