Merge "Fix 'associated' javadoc typos" am: 3fd2c5c435

Change-Id: I2d94f1a8a7a2a9d811c122123012273900857c47