4.9 linaro fixes