Bring in DeviceSettings

Change-Id: I0e3710d6d79a4478608cac9c1d0e75fad26ea36e