Merge "Finally remove ZipString." am: 2226fe6ddf
am: a292c30e9c

Change-Id: I39f1e5efbebd2bc724efa76b7b18975674444523