Merge "Fixed Autofill NPE that crashed some apps." into oc-dev