am dbd43691: am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size...

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

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