Merge "Fix new[] vs delete mismatch."