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

Change-Id: Iea7c1e1ec2b50a1263150b9aafd353bc35718436