Merge "Fixing grammar, capitalization and spelling in comments"