Merge "ScannerTest#testPerformance(): Improve failure reporting."