Merge "Remove mId from DeviceDescriptor."