Linaro Changes

Change-Id: Ibf4fb7dd58ee9b0f1e6f0b51b80460e35d98c48f