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

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