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

Change-Id: Ic1386954d8c0be43525919e1ef0719dd5cc7c85c