Merge "Revert "Enable String compression."" am: 95c867dcb9
am: 954ff89737

Change-Id: I80a636a07030553a02c7340a67b1f8e680ae54ad