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