Merge "Fix typo in comment"