Merge "Fix 'associated' javadoc typos"