[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 skipped: 4a53559e
Change-Id: I4299e6a86c1006f2545f925da4552be7fda75f32