Merge "cherry-pick from pi-dev docs: Fixing malformed javadoc"