Merge "Revert^2 "Add malloc calls to heap profile test"" into main