Settings: Refactor for new API and remove some unused references / imports

Signed-off-by: San Mehat <san@google.com>
5 files changed