Merge branch 'tracking-perf' into merge-linux-linaro-core-tracking