Merge "Replace LocationProvider with ProviderProperties"