Merge "usb: diag_bridge: Add support for PID 0x904c" into msm-3.0