Merge with upstream caf changes and remove linux upstream commits

We will merge upstream linux upstream commits later.