Merge "qca: Modify pack.py script"