Merge "Clean up BT stress tests." into honeycomb-mr1