Merge "Add logic for replacing maps for zip files"
am: a70bf347f7

Change-Id: Icad4d96f4e083e472b59702e8b801d0e0eb4c1ff