Merge "Upgrade common-packer to v0.3.1"