Bug 962938 - Inconsistent file path in zip file
Merge pull request #15671 from cctuan/962938

Bug 962938 - Inconsistent file path in zip file