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

Change-Id: Id74637b1d1ca09ec9c0c1c658f70db9567581d5b