Merge "Revert "Fixed FieldClassificationStrategy that gets data from the package info.""