Merge "Move off the Next ZipString overload."
am: 0c0afe17e9

Change-Id: I29a180b930574a3dd663353949e25499fb0b4934