Merge "ZipWriter: Do not write DataDescriptor for STORED files" into oc-dev