Merge "Revert^2 "Enable String compression.""
am: 7f1f3367e6

Change-Id: I73a58188697f9ba31cd411296f4548c1f3ae44f2