Merge "Minor API changes on Autofill Field Classification:"