Merge "msm: ocmem: Add zone initialization checks" into msm-3.4