Linaro 4.8 fixes
linaro 4.8 fixes