Merge "Convert vpp to be Packer compliant"