[automerger skipped] Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"
am: c0e4ee7332 -s ours
am skip reason: change_id I2f78f0dbbace212309b87f779efad020cf255196 with SHA1 40431ae1bc is in history

Change-Id: I2f6d0b75851879f84167c689802a98645d96d3c1