Linaro 4.8 fixes

Change-Id: I3171443c7cf3e8364392c8a5223802f10a3659a3