Squash commits from Linaro - SaberMod