Merge "Finally remove ZipString."
am: 2226fe6ddf

Change-Id: Ia75bde872fa42cf31451b41625e9d5cec75f2b8b