Linaro 4.8 fixes

Change-Id: Ic93359a47e33084b6bd6d0828cd25c892f0a6fe5