Revert "Squash commits of Linaro"

This reverts commit 250317991dbdeb3d94542fb2d0e68c86daa2a67a.