include device specific cherry-picks