Merge "msm:ocmem: ocmem_drop api"