Merge "Couple autofill fixes." into oc-dev