Merge "Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"" into qt-dev
am: 660c234e9a

Change-Id: I1142efdfe93ff9e5ac8f33af9f58e27d52f02236