Merge "defconfig: msm8974: Enable the modem subsystem restart driver" into msm-3.4