Merge "Fix bug in writing zips."
am: fa5fbae27f

* commit 'fa5fbae27f65793fa81f4e538785d78c326c6039':
  Fix bug in writing zips.