Merge "Fix race condition when changing passwords"