am febe48ae: am 3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-dev

* commit 'febe48aef0cb757e149d6f4494c9d220d6ba369a':
  Fix valgrind issues