Merge "Fix string compression, add tests."
am: 82c8cdc24a

Change-Id: I7aa664764a3efdfac949c0c22ee9242170ef7e1b