Align with Linaro