Merge branch 'rebase-last-minute-fixes' into merge-linux-linaro