Merge "Revert "Handle kernel launch calls""