Merge "Fix PerformanceTest failure" into tm-mainline-prod