Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387 am: 088c6aa773
am: 7d6c1b72f9

Change-Id: Ic4ee17445756cf9a75a1e9995656d3c4dc32458d