adjust DeviceSettings to new kernel

Change-Id: If9f640070eebf584f0a1f79a6e23a4932b58da5e