Fix truncated webp images DO NOT MERGE am: 99740b3bb9
am: ffc7e57387

Change-Id: I189f273c58239a2ef55f6f5cb145b8f386dfbc26