Squash commits from Linaro