Merge "Move off the Next ZipString overload." am: 7b67d28518 am: 505ed45940
am: ee57256055

Change-Id: I0d6131d183a52a9c7fd54c5a00926d99cf6c408d