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