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

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