This re-applies #32437 with a fix to the broken device lab test.
Attach a file by drag & drop or click to upload
