Merge "Adds a config for default autofill service." into oc-dev