[automerger skipped] Merge "Move one last caller off ZipString." am: 4c76131a
am: a05d8706 -s ours
am skip reason: change_id I723570315285d7c2caadffd71cd2d15efde11819 with SHA1 b52f0a0a is in history
Change-Id: I55b3132547d790a97ac9322d969326373b129916