Merge "hal/usb: Fix for Klocwork issues"