[automerger skipped] Merge "Do not load xml metadata for unchanged packages in...
[automerger skipped] Merge "Do not load xml metadata for unchanged packages in RegisteredServicesCache" into pi-dev
am: 7ed81d17 -s ours
am skip reason: change_id I5c1f57108c4b67d24b198000d57216c63d35290a with SHA1 1033db8d is in history
Change-Id: Id074701210f4522750df7cd83f84a5f23bfb5b2d