linaro patches for wilhelm

Change-Id: Ib1a282e04450ac07a1e5bac513531feb97287656