Merge branch 'tracking-llct-last-minute-fixes' into merge-linux-linaro-core-tracking