Merge "Add constant for autofill-service-add URL" into oc-dev