am d6a6bf3f: Merge "Fix valgrind error." into jb-mr2-dev

* commit 'd6a6bf3f29bfa86a02e33eabf041e6ec136308af':
  Fix valgrind error.