Merge "Use dm.CreateDevice() with a timeout."