Merge "Added missing important-for-autofill mappings." into oc-dev