Merge "Correcting spelling errors in logs and comments."