Linaro 4.7

Change-Id: I9a5f71230abbc975f49aa291b71726f267110b27