More errors in javadoc link generation

Change-Id: I71daf236194f889730af2dcbfa9ea7e07498db25