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

Change-Id: If4ba3d59929f33634e1d95080d94dd9645342e3e