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

Change-Id: Icf8f2b15b932acfe45fe48ec1b79307280957a12