Changes for Linaro