Merge "usb: diag_bridge: Avoid NULL pointer references" into msm-3.4