Merge "Remove more String8"