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

Change-Id: I2d7d5a8eb571ceb093f26d3f9805917b201167f7