Linaro fixes

Change-Id: I9c47cff4fe3028a98790b47d5414e95b3e5f0d07