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

Change-Id: I6df4f638363ee959e570bc60ca01b55063cdd7af