Rebase on franco kernel