Merge branch 'linaro-ics' into linaro-jb