[automerger skipped] Merge "Do not load xml metadata for unchanged packages in RegisteredServicesCache" into pi-dev am: 7ed81d17ba -s ours
am: b323683c45 -s ours
am skip reason: change_id I5c1f57108c4b67d24b198000d57216c63d35290a with SHA1 1033db8ddf is in history

Change-Id: I15fef0fde31b7b15c6444fbc6ed9ef9c328880c4