Merge "Remove autofillMode attribute" into oc-dev