Merge "Reset the default usb package less often" into oc-dev