Merge "defconfig: msm8610: enable CONFIG_MSM_OCMEM_POWER_DISABLE"