Add MemoryManagement from CM

Change-Id: I87e9379326131b9330f5cde348978c46d0072a19