Merge "Passing device name up through getDeviceDescriptor() method (when creating)"