Merge "Clean up some javadoc issues" into nyc-dev