Merge "Update Javadoc references"