Merge "DeviceState implementation"