Merge "Fix memory leak in String16"