Merge "msm: ocmem: Enable local power control by default" into msm-3.4