Changes for Linaro 4.10