Merge "FieldDef: Fix type @param fields in class javadoc"