Merge "Revert "Coredomain can't execute vendor code.""