[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before...
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f1391 skipped: cce521e4
Change-Id: I7e60856514769442397e0055e2edae73e9b92cee