Make linaro 4.7.4 changes