Fix truncated webp images DO NOT MERGE
am: 99740b3bb9

Change-Id: Ieeb5f8a69c42db29e3cd3abcffa575055647a958