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

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