Prepwork for Linaro 4.7