Merge "add DeviceInfo"