More DeviceSettings cleanup

Change-Id: Ib22207e9543a5dca1a15e587a21d26ef3b9ede04