am 134f4436: am f36a2311: am 3e13ed08: Merge "Cleanup ziparchive"

* commit '134f443696e00e98de8efbbbe4d90ae607a83f86':
  Cleanup ziparchive