Merge "Move virtlet overrides to compute"