Merge "Device Info API"