Merge "Refactored Autofill Field Classification tests."