Merge "Increase bind timeout timer." into nyc-dev
am: a7c0912

* commit 'a7c09123ba0295b5df898d9c221cd8b900e75341':
  Increase bind timeout timer.