Linaro 4.8 fixes

Change-Id: I034f449ff4476b7f03878559269aa468d3e9285a