Merge "Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." am: 90c39351 am: 9c051367 am: 4c2143df am: 10eceff1 am: b90b509f" into tm-dev