Update for linaro

Change-Id: I17a218ea57483638f094169289d3b42336186c61