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

* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.