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

* commit '5d75b988bc7b02f5f2b3f8518238007cb0e68b16':
  Fix valgrind tests