Merge "Fix missing renaming of PerfTestActivity"