Merge "Don't allow settings launch when user isn't setup" into oc-dev
am: 03435f75fa

Change-Id: I215923090ac89d856d0054314aa343b54f86154d