Merge "Make compsvc works in VM"