Merge "Deflake libdm#CreateEmptyDevice test"