Merge branch 'stable-3.9'

* stable-3.9:
  Remove duplicate binding of AllUsersName to AllUsersNameProvider

Change-Id: I62ea4fd8b7485f0496c244127fc8122356765b32