Merge "Fix crash loop due to broken packages.xml around updated-package"