Merge "Switch PackageStatusStorage to XML-based storage" am: 4e77ae6d1a am: 4a7e3de5e7
am: c1bf6505c8

Change-Id: I3342b515252fd5169a59b5b7d93d1d109036445c