Merge "Use system device name as OSD name"