Merged OCMEM code updates from KK Source to fix mem allocates for drivers.