Merge "[ProviderModel] Internal cleanup, remove the Provider Model flag"