Merge "usb: msm_otg: Reduce diff with upstream"