Updates DeviceSettings

Change-Id: I892eea30fe81bd972c2b328d1771a3878fc24959