Merge "Fix a Java Doc typo" into sc-dev