Merge "Remove redundant vmpolicy variable"