Merge "defconfig: msm9615: enable usb bus suspend" into msm-3.4