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

* commit '1fcfb81034784ccf0515ef23c327d06969bc50f7':
  Minor fixes for image processing.