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

Change-Id: I7e60856514769442397e0055e2edae73e9b92cee