am ba5af1f1: Merge "The original timeout (4 mins) is too rigorous in live network." into gingerbread

* commit 'ba5af1f1f09ed6cfee1f7f7ab368747f9b81e86d':
  The original timeout (4 mins) is too rigorous in live network.