am 2f97217b: am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1

* commit '2f97217bfca0e89b88498c44a8f0f5ad35091b0a':
  Clean up BT stress tests.