Merge "Extract LocationProviderManager"