Merge "Update the strings for the autofill enable dialog" into oc-dev