Merge "Fix typos in string constants"