[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before...
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a513 skipped: 244aba44
Change-Id: I7efba2ee6798c5fb71679bee7861d98f3643f414