Merge "Fix a javadoc @see error" into nyc-dev