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