am 288f1373: am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread

Merge commit '288f13730e6535fb36581781196a55a6f2d198d6'

* commit '288f13730e6535fb36581781196a55a6f2d198d6':
  Change disable timeout for BT disable stress test