Merge "ProviderMap: remove hashmap when entire user specific entries are removed"