Merge "Update common-packer to latest master"