Merge "Enable String compression." am: 53ea6a10bb am: af23a338bc
am: 8383667d6e

Change-Id: I5527c778764aebf44796c9df1e23a50e35b77c56