Merge "Stabilize perf data." into jb-mr1-dev