Merge "Don't flush auth token table when password changes."