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