Merge "Change string compression encoding."
am: 16593ed1d3

Change-Id: If13d40df57ad81a72fcf3f908da4e1e951f5620c