Merge "Disable autofill while user setup is not completed." into oc-dev
am: 3540463b74

Change-Id: I0a95d3c79a16240d00a8684341d00c9b76927fbf