Merge "Fix broken more JavaDoc links"