Merge "Fix mistake in java doc" into nyc-dev