Move settings into account

Change-Id: I0e791ead6c54af96afbfdf1d38457fb2fb41c4dc
2 files changed