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