Merge "Do not include image header in decompressed size"
am: 11ad252355

* commit '11ad2523557c35acfbf829aa203d14914e61884e':
  Do not include image header in decompressed size