Adding DeviceSettings properly

Change-Id: I4250a6c722f269710f424f869ea1f8db6cefd9f4