Merge "Fixing typos made in comments"