Merge "Improve logging and flexibility of BT stress tests." into froyo