Merge "Moar changes for Autofill Field Classification mechanism:"