am 604e2828: Merge "Fix valgrind error."

* commit '604e2828896fbb8663897d1e75112da7305ead4c':
  Fix valgrind error.