am 0b35b978: Merge "Fix valgrind errors."

* commit '0b35b9781b9e7143d673474fd59e13294c90abb5':
  Fix valgrind errors.