Merge "Sync with upstream perf-3.12."