Linaro 4.7 Fixes 2