Merge "Fix race condition when changing passwords for admin tests"