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

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