Merge "Adding ability to control how the USB data is dumped."