Merge branch 'test-service-functions' into dt-test
Merge branch 'update-usb-tools' into dt-test