[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439 skipped: 4a53559e98

Change-Id: I4299e6a86c1006f2545f925da4552be7fda75f32