Merge "Keep device name empty when the remote device does not report its osd name"