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

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