Merge "Adjust the bind timeout" into oc-dev
am: 9d9d31d6b0

Change-Id: I53b0afac3e8e8247a3bc2154a32f775dc707ef5c