[automerger skipped] Merge "Move one last caller off ZipString." am: 4c76131a07 am: a05d870629 -s ours
am: 85c2aa8ecc -s ours
am skip reason: change_id I723570315285d7c2caadffd71cd2d15efde11819 with SHA1 b52f0a0a9c is in history

Change-Id: I736a758216666f027ffad64b146de3b7f4d55f9c