Merge "Clean up javadoc." into nyc-dev