fix device specific cherry-pick logic