Merge "Do not load xml metadata for unchanged packages in RegisteredServicesCache" into pi-dev