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

* commit 'ff7735b0ee8c3347d0f3cb1866e454be0e9534e2':
  ProviderMap: remove hashmap when entire user specific entries are removed