Merge "Clean up Bluetooth test code." into nyc-mr1-dev