Merge "usb: diag: Set interface protocol to represent diag" into msm-4.8