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