Merge "Revert "add DeviceInfo""