Merge "Optimizing: Fix a new valgrind error in image_test."
am: 0339bee

* commit '0339bee5b1be39669606c4ba57edd42a0bacf0ff':
  Optimizing: Fix a new valgrind error in image_test.