Merge branch 'tracking-llct-v3.6-misc-fixes' into merge-linux-linaro-core-tracking