Merge "Fix code for new malloc debug enable."