Merge "Minor fixes on Autofill Framework:" into oc-dev