Merge "Optimizing: Fix valgrind error in image_test64." am: 51b7e2d08f
am: 58b58754fa

* commit '58b58754faaf959fa7c620ee5fc64553cb457980':
  Optimizing: Fix valgrind error in image_test64.