Merge "Change disable timeout for BT disable stress test" into gingerbread