Merge "Make DeviceFileReporter work properly with non-glob filenames"