2to3: map fix

Change-Id: I749b42dfa86c4154bfc9145cb1e2ac662f8c2e64
2to3: zip fix

Change-Id: Ida893708bef6cb124f506952444048ed7f765449
Merge "2to3: map fix"
Merge "2to3: zip fix"