Merge "Modify PerformanceTests to test for renames and greater size" into mainline-prod