Merge "Do not include image header in decompressed size" into nyc-dev
am: 3a1b33df0d

* commit '3a1b33df0df7db2b8685f8616b9240accd6a23c5':
  Do not include image header in decompressed size