am 968af754: am 604e2828: Merge "Fix valgrind error."

* commit '968af75416953a7eae736b4a05aec86e7c8f8d67':
  Fix valgrind error.