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

Change-Id: Ia0fdddcbe8ff49017cdd7d61c9d5d0725892e043