Merge "Some Autofill API changes." into oc-dev