[WIP] rebase over linaro patches