Merge "Fix perf2cfg unit tests and enable presubmit testing."