Merge "SpecialVersion: Grammar fixes in comments"