am 85c71397: am 65cc64fb: am 261d3cda: Merge "Reconcile differences between zip implementations" into klp-dev

* commit '85c71397de65148370bad0be6ba95cffd4fd5fa8':
  Reconcile differences between zip implementations