Fix file artefacts that were incorrectly identified as ZIP files

Bug 1302251

Change-Id: I77fcbd9c534afa26296badca0ccb33f197eca648
Merge "Fix file artefacts that were incorrectly identified as ZIP files"