Add full support for CM memory management

Change-Id: Ib18b4f9e234ea9a0904036d64a88a4b1ff2d5056