Merge "Update UsbHandlerTests" into pi-dev