am 3d96846b: Merge "Fix valgrind heap_test."

* commit '3d96846b6adedf57be64eb3873de0ca58ec4b827':
  Fix valgrind heap_test.