Merge "Fix some racines in AutofillManager" into oc-dev