am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit '9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817':
  DO NOT MERGE - Fixed crash for odd image width/height