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

* commit '22e21da663677d12768d38b95d65a747a4a0540b':
  Clean up BT stress tests.