Merge "Remove wrong javadoc comment"