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

* commit 'f36a2311ab7232e0b91dc009a3a2d1d9c8130c37':
  Cleanup ziparchive