Merge "Fix grammatical error in several comments"