Merge "Refactored Autofill to move starting flag out of Session." into oc-dev