Don't use the super-evil Settings singleton in client/repo

Change-Id: I50692c8091bcf4e2e0cbb23e50dd5b67b5d428a2
Merge "Don't use the super-evil Settings singleton in client/repo"