Linaro 4.8 fixes
Linaro 4.8 fixes