Merge "Fix some syntax errors in javadoc"