Merge "[NAN] Fix javadoc links"