Merge "usb: Fixed the null pointer issue" into tm-dev