am 317f7a4f: am 5d75b988: am 2ff3c2cd: Merge "Fix valgrind tests"

* commit '317f7a4f27137db0499a800aba70ae21dc153904':
  Fix valgrind tests