Update linaro branch

Change-Id: I2a6c2b7eb3e796f060dc42e7b1542a42d8e3c41d