am ea8180ff: Merge "Minor fixes for image processing."

* commit 'ea8180ff6045dc0b3e63c19d450876e12383adc6':
  Minor fixes for image processing.