am 33484005: Merge "Do not retry if port number is unavailable." into mnc-dev

* commit '334840054f5da027c498636b2b3269806e1fe592':
  Do not retry if port number is unavailable.