Merge "Fix a comment typo" into sc-dev