Merge "defconfig: msm8610: enable deferred resume"