Merge "msm: ocmem: Add support for disabling OCMEM power management" into msm-3.4