Merge "Remove incorrect note about truncation in the javadoc"