Rebase on ivendors device files