Merge "Move one last caller off ZipString."
am: 4c76131a07

Change-Id: I4394d0ca20a65f914c6c87e76d3d7203c57d1046