Track Linaro from shrike1978
Merge branch 'ics' into ermahgerd