Merge "Add autofill feature API" into oc-dev