am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit '4985f06f4e96351c77b88b20bc9ded65daefcd3e':
  Make image-size-from-data-size not use hard coded values.