changes for linaro 4.8