am 4270e741: Merge "Fix valgrind imgdiag test failure / memory leak in runtime"

* commit '4270e74152d8a7cd979ab5a92fe2a8f84adb8a42':
  Fix valgrind imgdiag test failure / memory leak in runtime