Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult"