Merge "msm: ocmem: Improve error handling during allocation of ocmem memory"