Merge "Update UserManager#removeUser to follow API guidelines."