Merge "Avoid NPE when ProviderInfo is missing." into klp-dev