Fixes for Linaro 4.9

Change-Id: If63ce961ce027531eb50b0af120de5d9ff06baa5