Clean up Settings imports

Change-Id: I04543db06b0e2149e78ae0a2a51b6e7eab0d6257