am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user...
am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit 'ff7735b0':
ProviderMap: remove hashmap when entire user specific entries are removed