[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16

Change-Id: Ieb67174f2b98361f82ebc6c76b18bb904d44ea99