Merge "Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." am: 90c3935195 am: 9c051367f8 am: 4c2143df58 am: 10eceff1b1 am: b90b509fc7" into tm-dev