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

Change-Id: I37b723fcad273492eebc3f577c3fe2cc34173dc2